Merge remote-tracking branch 'origin/master' into feature/android

author Po Lu <luangruo@yahoo.com>

Wed, 5 Jul 2023 00:45:06 +0000 (08:45 +0800)

committer Po Lu <luangruo@yahoo.com>

Wed, 5 Jul 2023 00:45:06 +0000 (08:45 +0800)
author Po Lu <luangruo@yahoo.com>
Wed, 5 Jul 2023 00:45:06 +0000 (08:45 +0800)
committer Po Lu <luangruo@yahoo.com>
Wed, 5 Jul 2023 00:45:06 +0000 (08:45 +0800)
diff --cc etc/NEWS
Simple merge
diff --cc lisp/net/tramp.el
Simple merge
diff --cc lisp/progmodes/cperl-mode.el
Simple merge
diff --cc lisp/simple.el
Simple merge
author	Po Lu <luangruo@yahoo.com>
	Wed, 5 Jul 2023 00:45:06 +0000 (08:45 +0800)
committer	Po Lu <luangruo@yahoo.com>
	Wed, 5 Jul 2023 00:45:06 +0000 (08:45 +0800)
		1	2
etc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/net/tramp.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/progmodes/cperl-mode.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/simple.el	patch \|	diff1 \|	diff2 \|	blob \| history